From 1a60d00ed9ddb54a8e60c7e1bde66aa0e40bb734 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sun, 27 Jan 2002 00:36:38 +0000 Subject: [PATCH] Don't send MODALITY_ON/OFF if socket->same_app (More fixes for #69735) Sat Jan 26 19:27:23 2002 Owen Taylor * gtk/gtksocket.c (gtk_socket_grab_notify): Don't send MODALITY_ON/OFF if socket->same_app (More fixes for #69735) --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtksocket.c | 9 ++++++--- 8 files changed, 41 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 17f95cac07..9ed2906dcf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Jan 26 19:27:23 2002 Owen Taylor + + * gtk/gtksocket.c (gtk_socket_grab_notify): Don't + send MODALITY_ON/OFF if socket->same_app (More fixes for #69735) + Sat Jan 26 19:04:37 2002 Owen Taylor * gtk/gtkmain.c (check_is_grabbed): Return FALSE not true diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 17f95cac07..9ed2906dcf 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Sat Jan 26 19:27:23 2002 Owen Taylor + + * gtk/gtksocket.c (gtk_socket_grab_notify): Don't + send MODALITY_ON/OFF if socket->same_app (More fixes for #69735) + Sat Jan 26 19:04:37 2002 Owen Taylor * gtk/gtkmain.c (check_is_grabbed): Return FALSE not true diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 17f95cac07..9ed2906dcf 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sat Jan 26 19:27:23 2002 Owen Taylor + + * gtk/gtksocket.c (gtk_socket_grab_notify): Don't + send MODALITY_ON/OFF if socket->same_app (More fixes for #69735) + Sat Jan 26 19:04:37 2002 Owen Taylor * gtk/gtkmain.c (check_is_grabbed): Return FALSE not true diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 17f95cac07..9ed2906dcf 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Sat Jan 26 19:27:23 2002 Owen Taylor + + * gtk/gtksocket.c (gtk_socket_grab_notify): Don't + send MODALITY_ON/OFF if socket->same_app (More fixes for #69735) + Sat Jan 26 19:04:37 2002 Owen Taylor * gtk/gtkmain.c (check_is_grabbed): Return FALSE not true diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 17f95cac07..9ed2906dcf 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sat Jan 26 19:27:23 2002 Owen Taylor + + * gtk/gtksocket.c (gtk_socket_grab_notify): Don't + send MODALITY_ON/OFF if socket->same_app (More fixes for #69735) + Sat Jan 26 19:04:37 2002 Owen Taylor * gtk/gtkmain.c (check_is_grabbed): Return FALSE not true diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 17f95cac07..9ed2906dcf 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sat Jan 26 19:27:23 2002 Owen Taylor + + * gtk/gtksocket.c (gtk_socket_grab_notify): Don't + send MODALITY_ON/OFF if socket->same_app (More fixes for #69735) + Sat Jan 26 19:04:37 2002 Owen Taylor * gtk/gtkmain.c (check_is_grabbed): Return FALSE not true diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 17f95cac07..9ed2906dcf 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sat Jan 26 19:27:23 2002 Owen Taylor + + * gtk/gtksocket.c (gtk_socket_grab_notify): Don't + send MODALITY_ON/OFF if socket->same_app (More fixes for #69735) + Sat Jan 26 19:04:37 2002 Owen Taylor * gtk/gtkmain.c (check_is_grabbed): Return FALSE not true diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c index 6b33ddaa92..8c2deb198c 100644 --- a/gtk/gtksocket.c +++ b/gtk/gtksocket.c @@ -677,9 +677,12 @@ static void gtk_socket_grab_notify (GtkWidget *widget, gboolean was_grabbed) { - send_xembed_message (GTK_SOCKET (widget), - was_grabbed ? XEMBED_MODALITY_OFF : XEMBED_MODALITY_ON, - 0, 0, 0, gtk_get_current_event_time ()); + GtkSocket *socket = GTK_SOCKET (widget); + + if (!socket->same_app) + send_xembed_message (GTK_SOCKET (widget), + was_grabbed ? XEMBED_MODALITY_OFF : XEMBED_MODALITY_ON, + 0, 0, 0, gtk_get_current_event_time ()); } static gboolean -- 2.30.2